mvebu: cp110: align all comphy_index arguments type

The biggest comphy index can be equal to 6 so there is no need to use
uint64_t for storing it.

Change-Id: I14c2b68e51678a560815963c72aed0c37068f926
Signed-off-by: Grzegorz Jaszczyk <[email protected]>
Reviewed-by: Igal Liberman <[email protected]>
Reviewed-by: Kostya Porotchkin <[email protected]>

diff --git a/drivers/marvell/comphy/phy-comphy-cp110.c b/drivers/marvell/comphy/phy-comphy-cp110.c
index 8b78280b58bbb468cbd0fc11b8866294c3d88e70..326d5a85ddefdabdc1368555ba216e0effe16606 100644 (file)
--- a/drivers/marvell/comphy/phy-comphy-cp110.c
+++ b/drivers/marvell/comphy/phy-comphy-cp110.c
@@ -2201,7 +2201,7 @@ int mvebu_cp110_comphy_digital_reset(uint64_t comphy_base,
        return 0;
 }
 
-int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint64_t comphy_index,
+int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint8_t comphy_index,
                                uint64_t comphy_mode)
 {
        int mode = COMPHY_GET_MODE(comphy_mode);
@@ -2247,7 +2247,7 @@ int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint64_t comphy_index,
                err = mvebu_cp110_comphy_ap_power_on(comphy_base, comphy_index);
                break;
        default:
-               ERROR("comphy%lld: unsupported comphy mode\n", comphy_index);
+               ERROR("comphy%d: unsupported comphy mode\n", comphy_index);
                err = -EINVAL;
                break;
        }
@@ -2257,7 +2257,7 @@ int mvebu_cp110_comphy_power_on(uint64_t comphy_base, uint64_t comphy_index,
        return err;
 }
 
-int mvebu_cp110_comphy_power_off(uint64_t comphy_base, uint64_t comphy_index)
+int mvebu_cp110_comphy_power_off(uint64_t comphy_base, uint8_t comphy_index)
 {
        uintptr_t sd_ip_addr, comphy_ip_addr;
        uint32_t mask, data;

diff --git a/drivers/marvell/comphy/phy-comphy-cp110.h b/drivers/marvell/comphy/phy-comphy-cp110.h
index ada6aecaed9d3367dd955de823dd3df063dc3b7c..2461e5ca9ed7d3d10d0ef2e8faf6c08cc6a6bc11 100644 (file)
--- a/drivers/marvell/comphy/phy-comphy-cp110.h
+++ b/drivers/marvell/comphy/phy-comphy-cp110.h
@@ -8,11 +8,11 @@
 /* Marvell CP110 SoC COMPHY unit driver */
 
 int mvebu_cp110_comphy_is_pll_locked(uint64_t comphy_base,
-                                    uint64_t comphy_index);
+                                    uint8_t comphy_index);
 int mvebu_cp110_comphy_power_off(uint64_t comphy_base,
-                                uint64_t comphy_index);
+                                uint8_t comphy_index);
 int mvebu_cp110_comphy_power_on(uint64_t comphy_base,
-                               uint64_t comphy_index, uint64_t comphy_mode);
+                               uint8_t comphy_index, uint64_t comphy_mode);
 int mvebu_cp110_comphy_xfi_rx_training(uint64_t comphy_base,
                                       uint8_t comphy_index);
 int mvebu_cp110_comphy_digital_reset(uint64_t comphy_base, uint8_t comphy_index,